home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
QRZ! Ham Radio 8
/
QRZ Ham Radio Callsign Database - Volume 8.iso
/
mac
/
files
/
infodata
/
callbook.tar
/
callbook_1.3
/
server_patches
< prev
next >
Wrap
Internet Message Format
|
1991-04-05
|
11KB
From bihler@sequent.com Thu Apr 4 23:35:06 1991
Received: from electra.cs.Buffalo.EDU by castor.cs.Buffalo.EDU (4.1/1.01)
id AA23553; Thu, 4 Apr 91 23:35:04 EST
Received: from gateway.sequent.com ([138.95.18.1]) by electra.cs.Buffalo.EDU (4.1/1.01)
id AA25902; Thu, 4 Apr 91 23:36:31 EST
Received: from crg8.sequent.com by gateway.sequent.com (5.61/1.34)
id AA01672; Thu, 4 Apr 91 20:36:30 -0800
Received: by crg8.sequent.com (5.61/1.34)
id AA23062; Thu, 4 Apr 91 20:35:54 -0800
Message-Id: <9104050435.AA23062@crg8.sequent.com>
To: bowen@cs.Buffalo.EDU (Devon E Bowen)
Cc: bihler@sequent.com
Subject: Re: Callbook Server (Really: BUG!)
In-Reply-To: Your message of "Sun, 03 Mar 91 18:52:00 EST."
<9103032352.AA15669@castor.cs.Buffalo.EDU>
Date: Thu, 04 Apr 91 20:35:52 PST
From: Steve Bihler <bihler@sequent.com>
Status: R
# > The modifications are relatively minor. If you're interested in them,
# > I'd be glad to forward them to you, just let me know.
#
# Yes, I'd be interested in including them in my code if you don't mind
# sending the patches. The code I released is filthy. I never really
# intended to release it but it seems to be getting popular enough that
# I should clean it up and have an "official" release of some type.
Hi Devon,
Sorry for taking so long to get back to you, it's been *very* busy around
here.
I've incorporated my 'diffs' into your latest sources and am forwarding
them to you as per our previous discussion. Obviously some of the stuff
you probably don't want...
Anyway, a couple of things you need to be aware of regarding the patches
below:
- we run a closed/secure net here, so rather than my users bothering you,
I've changed the name on who to report problems to.
- SystemV.3 has a "slightly" different regexp facility, rather than
trying to modify your code to use this, I used a public domain
version, which is why you'll see some changes in this area.
- The sockets code has been modified just enough to work in a TLI
environment instead.
- Other than some pretty standard BSD vs SysV diffs, you shouldn't
find many other differences.
- I've double checked, the patches below work well with the "patch"
utility.
- I think I've got most everything contained behind "#ifdef", so
hopefully they can be integrated fairly cleanly.
Hope you or someone find the differences useful. If you should have
a questions, please don't hesitate to contact me.
Thanks again and thanks for a great tool.
Steve Bihler
email: bihler@sequent.com
tel: 1-503-578-4166
==X======X=====X=====X=====X===== CUT HERE =====X=====X=====X=====X=====X====X==
#! /bin/sh
# This is a shell archive. Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file". To overwrite existing
# files, type "sh file -c". You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g.. If this archive is complete, you
# will see the following message at the end:
# "End of shell archive."
# Contents: Makefile.diffs callbook.c.diffs callbook.h.diffs
# canadian.c.diffs endian.c.diffs filter.c.diffs hash.c.diffs
# lookup.c.diffs misc.c.diffs print.c.diffs telnet.c.diffs
# Wrapped by bihler@crg8 on Thu Apr 4 20:33:25 1991
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f 'Makefile.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'Makefile.diffs'\"
else
echo shar: Extracting \"'Makefile.diffs'\" \(705 characters\)
sed "s/^X//" >'Makefile.diffs' <<'END_OF_FILE'
X1c1
X< CFLAGS = -DINSTALL
X---
X> CFLAGS = -DINSTALL -DSYSV -DLOCAL -DDEBUG
X3c3
X< ALL = callbook hash endian canadian
X---
X> ALL = callbook hash endian canadian
X5,7c5,8
X< HASHOBJ = hash.o misc.o
X< CALLOBJ = callbook.o telnet.o misc.o lookup.o filter.o print.o
X< ENDIANOBJ = endian.o
X---
X> HASHOBJ = hash.o misc.o strcasecmp.o
X> CALLOBJ = callbook.o telnet.o misc.o lookup.o filter.o print.o \
X> regexp.o regerror.o
X> ENDIANOBJ = endian.o strcasecmp.o
X16c17
X< $(CC) -o callbook $(CALLOBJ)
X---
X> $(CC) -o callbook $(CALLOBJ) -lc -lnsl -linet
X23a25,28
X> cb_notavail: cb_notavail.o telnet.o
X> $(CC) cb_notavail.o telnet.o -o cb_notavail -lc -lnsl -linet
X>
X>
X25a31,33
X>
X> install:
X> mv $(ALL) ../bin/
END_OF_FILE
if test 705 -ne `wc -c <'Makefile.diffs'`; then
echo shar: \"'Makefile.diffs'\" unpacked with wrong size!
fi
# end of 'Makefile.diffs'
fi
if test -f 'callbook.c.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'callbook.c.diffs'\"
else
echo shar: Extracting \"'callbook.c.diffs'\" \(1306 characters\)
sed "s/^X//" >'callbook.c.diffs' <<'END_OF_FILE'
X13d12
X< #include <sys/socket.h>
X16a16,20
X> #ifdef BSD
X> #include <sys/socket.h>
X> #else
X> #include <tiuser.h>
X> #endif
X17a22
X>
X19a25,29
X> #ifdef DEBUG
X> FILE *dbf;
X> int debug = 0;
X> #endif
X>
X22a33,36
X> #ifdef SYSV
X> extern int errno, t_errno;
X> #endif
X>
X26c40,42
X< main()
X---
X> main(argc, argv)
X> int argc;
X> char **argv;
X29c45
X< int catch_size, quit=0;
X---
X> int catch_size, quit=0, result;
X35a52,67
X> #ifdef SYSV
X> tsync:
X> if( t_sync(0) < 0 ){
X> if( t_errno == TSTATECHNG )
X> goto tsync;
X> t_error("callbook - t_sync failed");
X> if (debug) {
X> fprintf(dbf, "callbook - t_sync failed\n");
X> }
X> exit(1);
X> }
X> #endif
X>
X> #ifdef SYSV
X> if(getpeerinaddr(0, &catch_host, catch_size) == 0)
X> #else
X36a69
X> #endif
X42c75
X< tputs("Callbook v1.2 Bug reports to bowen@cs.buffalo.edu Type ", 0);
X---
X> tputs("Callbook v1.2 Bug reports to bihler@sequent.com Type ", 0);
X288c321
X< tputs("No references found\n", 0);
X---
X> tputs("No references found-a\n", 0);
X322c355
X< tputs("No references found\n", 0);
X---
X> tputs("No references found-b\n", 0);
X357c390
X< tputs("No references found\n", 0);
X---
X> tputs("No references found-c\n", 0);
END_OF_FILE
if test 1306 -ne `wc -c <'callbook.c.diffs'`; then
echo shar: \"'callbook.c.diffs'\" unpacked with wrong size!
fi
# end of 'callbook.c.diffs'
fi
if test -f 'callbook.h.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'callbook.h.diffs'\"
else
echo shar: Extracting \"'callbook.h.diffs'\" \(670 characters\)
sed "s/^X//" >'callbook.h.diffs' <<'END_OF_FILE'
X11c11
X< #define DB_DIR "/gnu/ham_stuff/"
X---
X> #define DB_DIR "/home/bihler/callbook/database/"
X16c16
X< #define DB_TEXT "/gnu/ham_stuff/callsign.sort"
X---
X> #define DB_TEXT "/home/bihler/callbook/database/callsign.sort"
X21c21
X< #define HELP_DIR "/gnu/ham_stuff/help/"
X---
X> #define HELP_DIR "/home/bihler/callbook/help/"
X26c26
X< #define HELP_FILE "/gnu/ham_stuff/help/help"
X---
X> #define HELP_FILE "/home/bihler/callbook/help/help"
X31c31
X< #define HELP_PREFIX "/gnu/ham_stuff/help/help."
X---
X> #define HELP_PREFIX "/home/bihler/callbook/help/help."
X36c36
X< #define INFO_FILE "/gnu/ham_stuff/help/info_file"
X---
X> #define INFO_FILE "/home/bihler/callbook/help/info_file"
END_OF_FILE
if test 670 -ne `wc -c <'callbook.h.diffs'`; then
echo shar: \"'callbook.h.diffs'\" unpacked with wrong size!
fi
# end of 'callbook.h.diffs'
fi
if test -f 'canadian.c.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'canadian.c.diffs'\"
else
echo shar: Extracting \"'canadian.c.diffs'\" \(60 characters\)
sed "s/^X//" >'canadian.c.diffs' <<'END_OF_FILE'
X26a27,30
X> #ifdef SYSV
X> #define rindex strrchr
X> #endif
X>
END_OF_FILE
if test 60 -ne `wc -c <'canadian.c.diffs'`; then
echo shar: \"'canadian.c.diffs'\" unpacked with wrong size!
fi
# end of 'canadian.c.diffs'
fi
if test -f 'endian.c.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'endian.c.diffs'\"
else
echo shar: Extracting \"'endian.c.diffs'\" \(52 characters\)
sed "s/^X//" >'endian.c.diffs' <<'END_OF_FILE'
X9a10,12
X> #ifdef SYSV
X> #include <fcntl.h>
X> #endif
END_OF_FILE
if test 52 -ne `wc -c <'endian.c.diffs'`; then
echo shar: \"'endian.c.diffs'\" unpacked with wrong size!
fi
# end of 'endian.c.diffs'
fi
if test -f 'filter.c.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'filter.c.diffs'\"
else
echo shar: Extracting \"'filter.c.diffs'\" \(118 characters\)
sed "s/^X//" >'filter.c.diffs' <<'END_OF_FILE'
X8a9,11
X> #ifdef LOCAL
X> #include "regexp.h"
X> #else
X9a13,17
X> #endif
X>
X> #ifdef SYSV
X> #define index strchr
X> #endif
END_OF_FILE
if test 118 -ne `wc -c <'filter.c.diffs'`; then
echo shar: \"'filter.c.diffs'\" unpacked with wrong size!
fi
# end of 'filter.c.diffs'
fi
if test -f 'hash.c.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'hash.c.diffs'\"
else
echo shar: Extracting \"'hash.c.diffs'\" \(111 characters\)
sed "s/^X//" >'hash.c.diffs' <<'END_OF_FILE'
X38a39,41
X> #ifdef SYSV
X> #include <fcntl.h>
X> #endif
X47a51,54
X>
X> #ifdef SYSV
X> #define index strchr
X> #endif
END_OF_FILE
if test 111 -ne `wc -c <'hash.c.diffs'`; then
echo shar: \"'hash.c.diffs'\" unpacked with wrong size!
fi
# end of 'hash.c.diffs'
fi
if test -f 'lookup.c.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'lookup.c.diffs'\"
else
echo shar: Extracting \"'lookup.c.diffs'\" \(135 characters\)
sed "s/^X//" >'lookup.c.diffs' <<'END_OF_FILE'
X9a10,12
X> #ifdef SYSV
X> #include <fcntl.h>
X> #endif
X14a18,22
X>
X> #ifdef SYSV
X> #define L_SET SEEK_SET
X> #define index strchr
X> #endif
END_OF_FILE
if test 135 -ne `wc -c <'lookup.c.diffs'`; then
echo shar: \"'lookup.c.diffs'\" unpacked with wrong size!
fi
# end of 'lookup.c.diffs'
fi
if test -f 'misc.c.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'misc.c.diffs'\"
else
echo shar: Extracting \"'misc.c.diffs'\" \(58 characters\)
sed "s/^X//" >'misc.c.diffs' <<'END_OF_FILE'
X11a12,15
X> #ifdef SYSV
X> #define index strchr
X> #endif
X>
END_OF_FILE
if test 58 -ne `wc -c <'misc.c.diffs'`; then
echo shar: \"'misc.c.diffs'\" unpacked with wrong size!
fi
# end of 'misc.c.diffs'
fi
if test -f 'print.c.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'print.c.diffs'\"
else
echo shar: Extracting \"'print.c.diffs'\" \(58 characters\)
sed "s/^X//" >'print.c.diffs' <<'END_OF_FILE'
X12a13,16
X> #ifdef SYSV
X> #define index strchr
X> #endif
X>
END_OF_FILE
if test 58 -ne `wc -c <'print.c.diffs'`; then
echo shar: \"'print.c.diffs'\" unpacked with wrong size!
fi
# end of 'print.c.diffs'
fi
if test -f 'telnet.c.diffs' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'telnet.c.diffs'\"
else
echo shar: Extracting \"'telnet.c.diffs'\" \(197 characters\)
sed "s/^X//" >'telnet.c.diffs' <<'END_OF_FILE'
X8a9,11
X> #ifdef SYSV
X> #include <stropts.h>
X> #endif
X30a34,39
X>
X> #ifdef SYSV
X> if(ioctl(0,I_PUSH, "tirdwr") < 0) {
X> syslog(LOG_ERR, "tirdwr failed - %m");
X> }
X> #endif
END_OF_FILE
if test 197 -ne `wc -c <'telnet.c.diffs'`; then
echo shar: \"'telnet.c.diffs'\" unpacked with wrong size!
fi
# end of 'telnet.c.diffs'
fi
echo shar: End of shell archive.
exit 0